From: Rob Church <robchurch@users.mediawiki.org>
Date: Wed, 17 May 2006 21:07:04 +0000 (+0000)
Subject: There was no cockup. It was all a figment of Brion's imagination.
X-Git-Tag: 1.31.0-rc.0~57097
X-Git-Url: http://git.cyclocoop.org/%28%5B%5E/404?a=commitdiff_plain;h=69a0a07dc83ce715ec828e79e270c47231103eec;p=lhc%2Fweb%2Fwiklou.git

There was no cockup. It was all a figment of Brion's imagination.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index dc92491f36..460711c24d 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -292,9 +292,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 4873) Don't overwrite the subtitle navigation when viewing a redirect page
   that isn't current
 * Enforce the standard upper limit when accessing page histories
-=======
-
->>>>>>> .theirs
 
 == Compatibility ==